Partial migrate from previous version