xtext improvement

Modeled defined components