Fix manifest file
Update Xtend file