Shifting to .NET version 4