Minor changes to avoid copying Particle objects