Hi Denis, Just looked at the merged code (btw I can't find how to comment on it on github, it's a big mess), so I'm commenting here: I noticed 2 issues: * One is that even though I said in the vote mail that I didn't agree about keeping parameters in EntityReferences you've still kept them. Again I think we shouldn't keep them because we don't have an agreement about them ATM (Caleb is against them). Also you've exposed them with a protected method which means users can extend EntityReference and use them. As I said FTM I think you should move the notion of Locale **only** in DocumentReference since this is the only thing we've agreed about so far. * You have some comments in DocumentReference like this: * @param locale the new locale for this reference, if null, locale is removed I don't understand what this means. How can it be removed since they are immutable and it's in a constructor :) Also looking at setLocale I see: protected void setLocale(Locale locale) { if (locale != null) { setParameter(LOCALE, locale); } } I don't see any removal. Is it a leftover/typo? Thanks -Vincent