Ok, I'll update the API and then this PR.