Rename the project_set_id to collection_id for projects
Annotate models