Updated core files