TODO: Automated extract from demo plans