Update to Framework Version 2.0