Updated to xtend 2.4