This should be exposed as Public.