Ashwin/Pooja | #0000 | Few tweaks in migration scripts