Added xpointer and entityref to dao