Unify implementation of Particle Classes