Support for unique
Resolves #20