I agree, lets not expose internals it might come back to bite us