Sanne Grinovero What do you propose to do when a CustomTypeMetadata targets a type that is not part of "targetedTypes"? Maybe using an IndexedTypeMap<CustomTypeMetadata> and removing the CustomTypeMetadata#getTypeId() method would avoid that kind of corner case...