Added support for Type; started support for Roster and Contestant