Definitely, this sounds much less hacky. I'll update the PR ASAP.

Thanks for your input!