Increase optimization and performance