Changes according to issue #163

Dear @yomn-el-mistikawy 
please review the migration files