TZ refactoring