Add validation to EC/GNAT