[PATCH 5/5] Update model annotations