[Misc] Improve Demo processes