Refactor to service object