Updating to use setApiUrl and mapping
merging upstream