updated ecore, changed expression and subclasses to abstract