Add data validation on output