Changes for service handler refactoring.