Added support for System.Guid