Updates to support Guid fields