Added wait timeout to session