Added selective path preservation