Added TypeOutput to organise outputs