Annotate user and site models