Added support for item to be unique