Additional performance optimizations