Updates to some validation specifically around required and unique code
fields