Type Hinting improvements