Change Internal API to public API