Added new structure for demo generation