Added better migrate