OrganizationCharacteristic and MetadataUtil classes added