Updates connection handling
Fixes connection creation & deletion