Added tenant list support.