We've discussed this with @LorenzMeier, but I'm open for this. Do you have any better idea?