Align with IDL changes to make the worker story better