WIP: Attempt some more to finish the API change