Add support for unique id