Updates to 3.0 to 3.1 migration