Internal APIs improvements
Internal APIs questionable improvements