added users and general class