Remove static GUIDs and select case block, Add dynamic GUID list