Newgen iliasg

merging Jarda's suggestions to the ecore model