Port to new API

Authored by mlaurent on Dec 5 2018, 6:56 AM.