Make these required in the demo