#12: possibility to add new tenants
#12: possibility to add new tenants