Refactor Roster handling