Minor changes
Roster processing refactoring