Performance enhancements.