Updates to builder