Added connection scoping