Update to include weekStart and on-set-time