xml parser pages added, refactoring