Make the Package method really be a method of the context rather than the Value objects, and make the Value method call the context one. This means it is not necessary to pass the context as a parameter any longer.
Changed paths: