Parser works. Refactor xml view names.