Is this a hard work for you?
Can you please make some more? I would be happy if you do it in version 1.16.3
