Updated session checks