Rebuilt API to match last commit.