added data models for annotated & grouped tables