Updated for new descriptors