Replace rithis-stack by supplier