I was thinking this aswell, but that should then go in a different PR/ticket