Migration to 3.1