Did some refactoring to accommodate multiple connections
Did some refactoring to accommodate multiple connections