Timeout management integration in progress, heartbeat too