Improved binary build