Thanks! I'll try to find time to propose a PR. Also, for suggestions around the new API, would you prefer that be posted to PR #465, or can it be done here?