More work in bootstrapping internal data relationships.