Hi some notes (for myself to remember and for visibility) about what's left to do with Entity References before 2.2 final: 1) Continue migrating code to use reference objects instead of Strings. XWikiDocument class mostly done (but some work remain). Next to do: hibernate store, XWiki class. Then API package classes. 2) Decide how we handle velocity scripts. Either we handle reference objects in velocity or we continue to use strings. Note that some vm files currently do stuff like: $somespace + "." + $doc.name 3) Decide if we want to check for null names in EntityReference. If we do then we cannot use the normalizing feature for nulls anymore, which is useful. In this case we'd need to find another solution. 4) Implement extensible EntityType (ie not enum) 5) full retest of XE/XEM 6) Move to aspects deprecated methods as much as possible (except those that are required by Hibernate of course, such as get/SetWeb(), get/setSpace, get/setDatabase, etc). This means having moved all existing code to not use the deprecated methods anymore. 7) Agree on the need and format for object/property/class references (Anca's mail) Note that 1), 6) and 7) don't have to be absolutely finished for 2.2 final but the others do. Thanks -Vincent