Update due to core changes