Add random identifier for source_id
Fix source_xml element