Changed Typechart slightly