Removed the Guid support