Made tenant ID management more accurate