More tenant work

change some method signatures