Updated to use local connection