Added compoundfilestorage classes