Updates to builder code