[RFR] Added a way to change timeout