User Class fixed