Revamp of RosterSQLGenerator class