Change how outputs and targets are accessed