Removed xtend dependency