Hi, In order to fix issue http://jira.xwiki.org/jira/browse/XWIKI-1325 (Renaming a web page only updates backlinks in one language version) we need to store the language in the XWikiLink object/table. One solution then it modify XWikiHibernateStore from List loadBacklinks() which just return doc names to List<XWikiLink> loadBacklinks(). I have it almost done here but I wanted to ask you what you think. Another solution (but might be too complex for now) would be to include the language in doc full name by inventing a new syntax. For example: "wiki:Space.doc:language" In this case there's no change required to XWikiLink object/DB, nor for the loadBacklinks() method. The change is either in the code that calls getBackLinks() or in XWiki.getDocument(documentName) so that documentName supports language. WDYT? Thanks -Vincent