V2 changes

Updates to builder