Additional support for tZ and tz