Added elements and entityreference