More performance optimizations...