Removed CalculationContext to simplify code until a more general handler is in place.