Added duplicate check option; improved user feedback