Changed saved data from cookie-based solution to session-based