Add check for uniqueness