Improve annotation of User & Profile entities