Changes to support more particles features