Good idea, but can be in a separate PR.