Added mandatory elements to xml