Added: Some more migration logic.