DDS - Small changes