Switched to remove deduper interface