Refactor service gets