Another performance optimizations