Align with IDL and DOM changes