Data migration changes and Help added