Adapt execution with new implementation