If you're able to make this change soonish I'll merge it and do a snapshot release with @philwills merged changes. We just need to make sure the version is bumped to 1.20 as 1.19 is the latest release.