Updates for new api setup.