Update to framework version 2.0