Added changes to .NET2.0 solution