slight refactoring of participant storage
Merge remote-tracking branch 'origin/master'