Updates to validation logic