Still kinda out of scope of this PR, it was added at the beginning when I noticed it was missing, but doesn't really relate to these changes