Updated XML to use GUIDs
Updated code to use GUIDs