Api

This diff seems unrelated to the API changes. Is it intended? (Just checking. I'm ok to have this in this PR if it is needed.)