#28 refactoring OrbHandlerServiceImpl