Add performance enhancements