Add fields specific to the individual over the more general retrieval.
Clean up schema declarations and use more comprehensive source.