Added better duplicate handling