Comment From: wilkinsona

I've changed this to an enhancement as it changes public API. I'm also going to re-open it as I think we should revisit some of the class names as well.