Re-added .NET 2.0 support