Refactor: moved logic from service to adapter - 1st part