+ Moved processing to session handler