PIM-3325 : normalize attribute and option manager