Refactor service object