@pitr-ch I don't mind changing all of these instances, but I think we should od it outside of this PR given that this layer makes use of this pattern and this is not a full overhaul of that layer yet (given there are a few areas still to convert). Could we file an issue and address it all at once after?