326 - refactoring migration