DC/Ajay | #0000 | Added logging