Adding support to point to a running instance