Refactor to match new domain