@eltimn can you find some more time to think about it ? I'll fix other things here meanwhile.