Fixed up the TypeReferences awfulness (From struct to proper class)