Shall we do that in another PR ?