Addressing comments. Better pseudo-directory handling