Last Update For DMS
Fix Some Bugs 

Regards,
Emad