Keep tracked data in session correctly