Refactoring of cloudml model builders