Changed user and role classes