Participation API and some code cleaning
Participation API and some code cleaning