Add connection and request timeout handling