Change interface for timeouts a little bit