Some performance enhancements