adapted to introduction of TypedDescriptor