More optimized build.