First step to make it compatible with xTensor 1.1.0