Refactored build.