Change validation to RI