Optimizations added