Added abilty to prevent duplicates