Improved build order