Adding FieldReferenceConstraintContainer
Removing CompositeFieldKey & Forger