Add validation to values