helper-lib properly externalized and updated by @doowb