Added units loading from XML