Updates to core