Updating to properly handle multiple rowsets rather than overwriting them each time