Adding more documentation to the ContextManager and abstracting out the logic that populates a Context with values into a separate method.