Added Xtend extensions
Fixed conflict