Updated roster functionality