Added more iso8601 flexibility