Updates needed for cf-core.