Improve irrxml