OSNG-10 - extendet entity model