EHO-206 validation added