Added migrate + merge