Feature/improve migrations