DDS - Updated Data Classes and diagrams