Updated to handle have events per session