Modified UniqueId to be a struct rather than an object