Redone xml import