Improve unique id again