Preperations for proper timeout and max_window implementation