Changes to APIs to fit the new models

Changes as discussed during today's meeting.