Initial optimizations
Additional performance optimizations