Better XML parsing; friction class factory
XML parse refactoring