Refactor for domain classes