Updates based on the previous review

Two items are still left - adding output type and passThru