Added more XML elements
Added more elements and properties