Add TODO comment about checking that new attributes to be added are not already taken