Refactor generated models to Domain