Updates to the session management with better counter and location accuracy.