Fix auto-annotation and update model annotations