Added inactivity timeout