Additional optimizations