Adding TypeAnnotation support