Refactored ServiceMethodHandler to be a class instead of a delegate