Newsml refactor