Update for version 2.0