More performance optimizations