Further integration of symlinks