I could do that, but I think it would be out of the scope of this PR.