Started migrating to using the new API