Adding vocabulary links to Language and Role