Refactored service constants