Add multitenancy in storage callback