Improvements to the Genealogy model