Unexporting Api, we'll just use the helper methods now.