Added support for tz conversions