That might work, I was actually thinking something along those lines last week but wasn't certain how to do it. I'll update the PR with this update as well as a comment about why.