PIM-2248 : rework attribute types and remove deprecated ones