Updated session / cookie support