Use base connector and add update support

/to @ritch 
No trailing space? Just double checking this is what you want.