Upgrade of Integrator class