Added opTimeout feature