Store format/storage by name, not index