Added support to specify on which the tenant should be created