Refactor of migration
Refactor of imports