Updated to improve build order across various scenarios