Unique id support

Ah, right.