Make more interface public after split