Change structure for new mockup