Updated logic for DDL, DUR, DDR, DUL