Changes to APIs to fit the new models