added support for groups, machines, users and managed servers