Refactoring (Using xml input from file)
Upgrade version