Migrate to .NET 4