Updated session controller