now data model is correctly genrated for drafts