Added idle timeout