Adding directory and symlink support.