Refactor for maintenanceability
Automate reload xml