Converted modules to my xml parser