Added Guid support