Added some Migrate related support