Fix import and allow duplicates