- Add methods to ClassifyEvents
 - Small modif