General performance enhancements