Symlink implementation- synked with latest common lib