Further performance optimizations