[#ASSIST-5] Re-annotated models.