Adding Session Management Support