Improved handling of kite arguments
Appended Token types with T