t658 added support for data validation