Abstraction bitches (XML improvements)