Improve plugin logic, pass plugins count to session