Update of Atom and Integrator classes