Added tenants and other stuff