Adapt to Utils API, Rebased on master

Supersedes #229