Update XmlLoader, refactoring Activities