Update usage of SimpleDateFormat to ISO8601