Updates to make time-zone attribute optional