Changed retrieval of directories