Guid support

Changes to enable Guid support