Annotated models
Added key model methods and associations