Migrate to version 2.0