[tmp] Starting to get rid of Descriptor