Enhance t and T command