Removing uniqueness constraint for now