refactor BuildFromModels

Create class instances for builder