This symlink handling should be sub-method