Improve unique id generation again