Archana's changes, refactoring and MSDC-115