migrated to Xtend 2.6