Moving to xtend 2.6.1