Add Timeout management