PIM-1716 : Refactor AddAttributeTypeRelatedFieldsSubscriber