Migration to 4.0