Added xml template
Update TODO