* completed lineage construction refactoring