Add timeouts and retries to all commands