Added angularized link generation