IMPORTANT: Changed target version .NET to 4.

Some design fixes