Service related logic refactored