Added multi particle support