Refactor all objects are loaded from xml file