Adding symlink support