cahnges for tenant functionality