master: Add timezone support