it is out of the PR scope. I would happy to discuss it in separate PR. Other developers can easer to participate because of diff will be less.