Add support for DHT => DHS