Added user classes 2