Updated to format time in ISO-8601 format