working towards finalizing the datamodels