add guid support