Refactoring constants out of ServiceClient to avoid circular requires