Exposed the existance of the internal helper class to make it possible to override it.
Merged to revert quick and dirty implementation.