Update for tenanted hosting