Updated M4->M5 schema migration