we discussed your suggestion and found it hard to implement now. Let's do it as separate PR.