Migrating to 1.9.0