Adapted to DHT-related changes