better context handling in Integrator