Additions to particle infrastructure