Worked on the custom session handler