Adapt to Utils API, Rebased on master

Supersededs #229