Add safe_remote to remote calls