Yes. exactly. That's why this PR is so useful.
May be we can work something seemless, later on :)
Thanks for working on this.