Improved builder