New solution for .NET40