Change API to work with the iOS-Client