Added more linking features