fixed annotations for data model