Adding new wrapper to allow no-activity timeouts