Unique id support

Good point.