update after the generic changes in core