Improved codebase and consolidated public/private APIs to a single client