More classes added to xml.