Migration to 3.2