Rewrite migrations
Update for beta2