Added GUID generation support