Updated directory lookup