Changes for new outputs.