Refactor to use PCKMethodRedirector