Updated .NET framework to 4.0
Starting using Tuple instead of dictionary