Adding RPC handlers