Upgrade to version 2.0