Add without_encrypted scope