Add istanbul support