Updates to the core files