Add outputs earlier
closes #3167