Update the structure for the demo