Changes on session and & cookie handler