Change of strategy: Refactor in the build process is in progress.