Change 2 classes
1. DAO_XML
2. DataModel