Add validation of data