Updates to core files