Optimize roster handling