Update core to 2.6+