Updated to reflect changes in core