!: renamed class for connections, changed scope