Refactored for new domain