Time keys should use time zone instead of UTC - closes #29