Refactored Domain