Annotated models, added aggcat config.