PIM-2370: Take comment into accoutn
PIM-2370: Remove AttributeRepository dependency