update to DN 3.3 and use EntityGraph