wip: handling service refactoring