Refactoring inject interp