Added scoping to uniqueness