Updated to new api location