Updates for the demo and scaffolding