annotated aggregates and entities separated