Feature/improve migration