Updated TypesBuilder