Added support for 't'