add possibility to use multiple tenant columns