Improve the build order