Fixed User model, annotations for User