updated data model and added parsing