Update so that "users" are implemented as well