Migrating to 1.10.0