Merging new API with iOS client