@djazayeri are you fine with the non-backwards-compatible change here, or should I deprecate?