Update typechart to Gen 6