Added ISO8601 management