Feature/migration

bug fix