Good idea. I updated the PR with relevant changes.