Migration, Rv connect

Migration and rv_connect after refactoring