Internal API breakage