[PATCH] Updates all model annotations