Improve the build procedure