Added URLs and self referencing