Add support of tenant management