Move DHT loading to where it belongs