[migration] API changes and other improvements