Entry refactoring to service object