Now tenant listing also returns the legacy mapping