Updated with GUIDs
Updated code to use GUIDs