Upgraded to .NET Framework 4.0