Xtext changes