Let's address this, if you agree in a next PR.