Update to tweaked helper library