[PATCH aeolus] Annotated all Models