Optimize for deploy