New version using Xtend 2.6