Switch to autogenerated APIs