Migrated code from Menu to PickDescriptor