started refactoring of all builders