Modifications of core files