Updated XML import to work with new XML style. Created some constructors to make my life easier.