Update from upstream & add a way to pass in an existing DB Connection