Change to use new api-location