Adapted couteau's new interfaces