Adding unique id to self hosted version