Updated to include output directories.