Support for EntitiesDescriptor element #12