[DEV] Refactoring & Particle