Actually maybe that can be in a separate patch. I can merge this and we can add it later.