Updated data schema for new design