Rewrite to use the bin-wrapper module