Added UniqueObject constraint