Improve the symbolic link support