Improve build sequence