Adds changes to work with latest version of Core