added roster support