Added initial ISO8601 support