Refactor to new domain