Use base connector and add update support

/to @ritch