Particles refactoring