Adding support for .NET v4.0