getSafeUniqueId added