Added web session handling