Added SessionListener (need to be fixed)