Adding validation set for PrimaryToSecondary and SecondaryToPrimary