Restricted fields to non-primitive types
Reworked supplemental upto definitions and proofs.