Added check for unique