Adjusted mockup for new data model