Updated DataService, import/export clones event and can handle empty data