Add Raw in choice blocks