Adapting to latest changes in worker and data API