Refactored service object