added users and top-level class