Better identification of root dir