DHT Optimized version