Adding multitenacy feature - fixing BRS-109