Switch to use DomainBuilder to define models