Starting to migrate to 1.7