Roster refactors