More work shifted to the api