Changed super tenant id to use the available constant.