Added timeouts and errors management