Added option to skip existing