Handle project root change
Improve project root change handling