That's an API change and one for another PR