Updated references and aligned GUIDs