compiler refactor: introduced new model elements