Ddmodel refactored