Added roster functionality