More handing for outputs
0.2.2