Add support for xml output