User model + Ardent fix