Added XML configurator
Refactored