Support changes in core