Optimization for lower load time