updates for value set expansion for the build tool