Refactor AdminServiceInvocationHandler for generic handlers