Update for GroupManager - handle offline users better