Move to iso8601 parser for dates