More changes to builder