Move out of Public API