Further developed the directory finder