Update to add constructors for Service and RPC Connector on rebase