Updated to use default time zone