Take timezone into account for v2 tokens