Updated to work with new core.