Enhancements to the Siikir migrator