Adding the fields needed to get min and max context out of mapping
Making min and max contexts both come out. All tests pass.