Use extended helper to get compliant algorithms for CMS
And adapt other users of the helpers to the changed API.