Changes to work with new core