Move uniqueID into Atom, see issue #62