Some changes in core