Is this something that should be done now? It seems out of the scope of this PR.