Added per connection id, instead of one for the entire node