Improve build order