Add support for uniqueness identifiers

Signed-off-by: Rohan Jain <crodjer@gmail.com>