Add better validatior for EGN