Merge "Refactoring: pulled ServiceHandler methods to its parent class."