Interface changes after the meeting

Please use the new interfaces as agreed on the meeting.