Improved final build task