CR-19 - Refining DCN and DAN generation

https://github.com/dsubhaji/Gnome_MSR2009/issues/25