Update for system/core changes