Migrating to 1.0.2