- SDM: Descriptor types now saved