Model migration support reworked after review