Switch from private functions to public methods