Major updates for performance optimization