I would not mind having that in a PR