I think this is out of scope of this and should go to a separate PR.