meditrainv2 data model tweaks