Modified service structure so only one rpc service is needed.