Add support for without_tenant and is_current_tenant?