Updated data model; removed processing/serialization