Unique id support

:+1: