Migrate to Remote Service Invocation Handler