updated with new data model, no support for Doctor yet