AW-2112 #comment adding validation modules