Add in basic support for proper TZ handling