Added connection passing to other classes