Added component id to xml output