Added classes to users and functions around it