Added support for Guid field type and special character in field name