--- a/microdata-rdf/tests/0010.ttl	Mon Sep 03 12:08:44 2012 -0600
+++ b/microdata-rdf/tests/0010.ttl	Mon Sep 03 12:09:08 2012 -0600
@@ -2,4 +2,4 @@
 @prefix md: <http://www.w3.org/ns/md#> .
 @prefix schema: <http://schema.org/> .
 
-<0010.html> md:item ([ a schema:Thing; schema:track <foo>]) .
+<0010.html> md:item ([ a schema:Thing; schema:track (<foo>)]) .

--- a/microdata-rdf/tests/sdo_eg_md_11.ttl	Mon Sep 03 12:08:44 2012 -0600
+++ b/microdata-rdf/tests/sdo_eg_md_11.ttl	Mon Sep 03 12:09:08 2012 -0600
@@ -4,11 +4,12 @@
 
 <http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_11.html> md:item (
  [ a schema:WebPage;
-   schema:breadcrumb """
+   schema:breadcrumb ("""
   Books >
   Literature & Fiction >
   Classics
-"""] [ a schema:Book;
+""")]
+ [ a schema:Book;
    schema:aggregateRating [ a schema:AggregateRating;
      schema:ratingValue "4";
      schema:reviewCount "3077"];

--- a/microdata-rdf/tests/sdo_eg_md_12.ttl	Mon Sep 03 12:08:44 2012 -0600
+++ b/microdata-rdf/tests/sdo_eg_md_12.ttl	Mon Sep 03 12:09:08 2012 -0600
@@ -20,8 +20,8 @@
      schema:calories "240 calories";
      schema:fatContent "9 grams fat"];
    schema:prepTime "PT15M";
-   schema:recipeInstructions """
+   schema:recipeInstructions ("""
   Preheat the oven to 350 degrees. Mix in the ingredients in a bowl. Add
   the flour last. Pour the mixture into a loaf pan and bake for one hour.
-  """;
+  """);
    schema:recipeYield "1 loaf"]) .

--- a/microdata-rdf/tests/sdo_eg_md_13.ttl	Mon Sep 03 12:08:44 2012 -0600
+++ b/microdata-rdf/tests/sdo_eg_md_13.ttl	Mon Sep 03 12:09:08 2012 -0600
@@ -4,42 +4,44 @@
 
 <http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_13.html> md:item (
  [ a schema:MusicGroup;
-   schema:event [ a schema:Event;
-     schema:location "Memphis, TN, US";
-     schema:name "FedExForum";
-     schema:offers <http://www.w3.org/TR/microdata-rdf/tests/ticketmaster.com/foofighters/may20-2011>;
-     schema:startDate "2011-05-20";
-     schema:url <http://www.w3.org/TR/microdata-rdf/tests/foo-fighters-may20-fedexforum>],
+   schema:event (
      [ a schema:Event;
-     schema:location "Council Bluffs, IA, US";
-     schema:name "Mid America Center";
-     schema:offers <http://www.w3.org/TR/microdata-rdf/tests/ticketmaster.com/foofighters/may23-2011>;
-     schema:startDate "2011-05-23";
-     schema:url <http://www.w3.org/TR/microdata-rdf/tests/foo-fighters-may23-midamericacenter>];
-   schema:image <http://www.w3.org/TR/microdata-rdf/tests/foofighters-1.jpg>,
-     <http://www.w3.org/TR/microdata-rdf/tests/foofighters-2.jpg>,
-     <http://www.w3.org/TR/microdata-rdf/tests/foofighters-3.jpg>;
-   schema:interactionCount "UserComments:18";
-   schema:name "Foo Fighters";
-   schema:track [ a schema:MusicRecording;
-     schema:audio <http://www.w3.org/TR/microdata-rdf/tests/foo-fighters-rope-play.html>;
-     schema:duration "PT4M5S";
-     schema:inAlbum <http://www.w3.org/TR/microdata-rdf/tests/foo-fighters-wasting-light.html>;
-     schema:interactionCount "UserPlays:14300";
-     schema:name "Rope";
-     schema:offers <http://www.w3.org/TR/microdata-rdf/tests/foo-fighters-rope-buy.html>;
-     schema:url "foo-fighters-rope.html"],
-     [ a schema:MusicRecording;
-     schema:audio <http://www.w3.org/TR/microdata-rdf/tests/foo-fighters-everlong-play.html>;
-     schema:duration "PT6M33S";
-     schema:inAlbum <http://www.w3.org/TR/microdata-rdf/tests/foo-fighters-color-and-shape.html>;
-     schema:name "Everlong";
-     schema:offers <http://www.w3.org/TR/microdata-rdf/tests/foo-fighters-everlong-buy.html>;
-     schema:playCount "11700";
-     schema:url "foo-fighters-everlong.html"];
-   schema:video [ a schema:VideoObject;
-     schema:description """Catch this exclusive interview with
+       schema:location "Memphis, TN, US";
+       schema:name "FedExForum";
+       schema:offers <http://www.w3.org/TR/microdata-rdf/tests/ticketmaster.com/foofighters/may20-2011>;
+       schema:startDate "2011-05-20";
+       schema:url <http://www.w3.org/TR/microdata-rdf/tests/foo-fighters-may20-fedexforum>]
+     [ a schema:Event;
+       schema:location "Council Bluffs, IA, US";
+       schema:name "Mid America Center";
+       schema:offers <http://www.w3.org/TR/microdata-rdf/tests/ticketmaster.com/foofighters/may23-2011>;
+       schema:startDate "2011-05-23";
+       schema:url <http://www.w3.org/TR/microdata-rdf/tests/foo-fighters-may23-midamericacenter>]);
+       schema:image <http://www.w3.org/TR/microdata-rdf/tests/foofighters-1.jpg>,
+         <http://www.w3.org/TR/microdata-rdf/tests/foofighters-2.jpg>,
+         <http://www.w3.org/TR/microdata-rdf/tests/foofighters-3.jpg>;
+       schema:interactionCount "UserComments:18";
+       schema:name "Foo Fighters";
+       schema:track (
+         [ a schema:MusicRecording;
+           schema:audio <http://www.w3.org/TR/microdata-rdf/tests/foo-fighters-rope-play.html>;
+           schema:duration "PT4M5S";
+           schema:inAlbum <http://www.w3.org/TR/microdata-rdf/tests/foo-fighters-wasting-light.html>;
+           schema:interactionCount "UserPlays:14300";
+           schema:name "Rope";
+           schema:offers <http://www.w3.org/TR/microdata-rdf/tests/foo-fighters-rope-buy.html>;
+           schema:url "foo-fighters-rope.html"] [ a schema:MusicRecording;
+           schema:audio <http://www.w3.org/TR/microdata-rdf/tests/foo-fighters-everlong-play.html>;
+           schema:duration "PT6M33S";
+           schema:inAlbum <http://www.w3.org/TR/microdata-rdf/tests/foo-fighters-color-and-shape.html>;
+           schema:name "Everlong";
+           schema:offers <http://www.w3.org/TR/microdata-rdf/tests/foo-fighters-everlong-buy.html>;
+           schema:playCount "11700";
+           schema:url "foo-fighters-everlong.html"]);
+       schema:video
+         [ a schema:VideoObject;
+           schema:description """Catch this exclusive interview with
     Dave Grohl and the Food Fighters about their new album, Rope.""";
-     schema:duration "T1M33S";
-     schema:name "Interview with the Foo Fighters";
-     schema:thumbnail "foo-fighters-interview-thumb.jpg"]]) .
+           schema:duration "T1M33S";
+           schema:name "Interview with the Foo Fighters";
+           schema:thumbnail "foo-fighters-interview-thumb.jpg"]]) .

--- a/microdata-rdf/tests/sdo_eg_md_14.ttl	Mon Sep 03 12:08:44 2012 -0600
+++ b/microdata-rdf/tests/sdo_eg_md_14.ttl	Mon Sep 03 12:09:08 2012 -0600
@@ -4,9 +4,7 @@
 
 <http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_14.html> md:item (
  [ a schema:ItemList;
-   schema:itemListElement "HP Pavilion dv6-6013cl",
-     "Dell XPS 15 (Sandy Bridge)",
-     "Lenovo ThinkPad X220";
+   schema:itemListElement ("HP Pavilion dv6-6013cl" "Dell XPS 15 (Sandy Bridge)" "Lenovo ThinkPad X220");
    schema:itemListOrder "Descending";
    schema:mainContentOfPage "true";
    schema:name "Top 10 laptops"]) .

--- a/microdata-rdf/tests/sdo_eg_md_15.ttl	Mon Sep 03 12:08:44 2012 -0600
+++ b/microdata-rdf/tests/sdo_eg_md_15.ttl	Mon Sep 03 12:09:08 2012 -0600
@@ -4,24 +4,23 @@
 
 <http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_15.html> md:item (
  [ a schema:Movie;
-   schema:actor [ a schema:Person;
-     schema:name "Johnny Depp"],
-     [ a schema:Person;
-     schema:name "Penelope Cruz"],
+   schema:actor (
      [ a schema:Person;
-     schema:name "Ian McShane"];
-   schema:aggregateRating [ a schema:AggregateRating;
-     schema:bestRating "10";
-     schema:ratingCount "200";
-     schema:ratingValue "8";
-     schema:reviewCount "50"];
-   schema:author [ a schema:Person;
-     schema:name "Ted Elliott"],
-     [ a schema:Person;
-     schema:name "Terry Rossio"];
+       schema:name "Johnny Depp"] [ a schema:Person;
+       schema:name "Penelope Cruz"] [ a schema:Person;
+       schema:name "Ian McShane"]);
+   schema:aggregateRating
+     [ a schema:AggregateRating;
+       schema:bestRating "10";
+       schema:ratingCount "200";
+       schema:ratingValue "8";
+       schema:reviewCount "50"];
+   schema:author
+     [ a schema:Person; schema:name "Ted Elliott"],
+     [ a schema:Person; schema:name "Terry Rossio"];
    schema:description """Jack Sparrow and Barbossa embark on a quest to
  find the elusive fountain of youth, only to discover that Blackbeard and
  his daughter are after it too.""";
-   schema:director [ a schema:Person;
-     schema:name "Rob Marshall"];
+   schema:director
+     [ a schema:Person; schema:name "Rob Marshall"];
    schema:name "Pirates of the Carribean: On Stranger Tides (2011)"]) .

--- a/microdata-rdf/tests/sdo_eg_md_20.ttl	Mon Sep 03 12:08:44 2012 -0600
+++ b/microdata-rdf/tests/sdo_eg_md_20.ttl	Mon Sep 03 12:09:08 2012 -0600
@@ -6,33 +6,34 @@
  [ a schema:MusicPlaylist;
    schema:name "Classic Rock Playlist";
    schema:numTracks "5";
-   schema:track [ a schema:MusicRecording;
-     schema:byArtist "Lynard Skynard";
-     schema:duration "PT4M45S";
-     schema:inAlbum "Second Helping";
-     schema:name "Sweet Home Alabama";
-     schema:url "sweet-home-alabama"],
-     [ a schema:MusicRecording;
-     schema:byArtist "AC/DC";
-     schema:duration "PT3M32S";
-     schema:inAlbum "Back In Black";
-     schema:name "Shook you all Night Long";
-     schema:url "shook-you-all-night-long"],
+   schema:track (
      [ a schema:MusicRecording;
-     schema:byArtist "ZZ Top";
-     schema:duration "PT4M13S";
-     schema:inAlbum "Eliminator";
-     schema:name "Sharp Dressed Man";
-     schema:url "sharp-dressed-man"],
+       schema:byArtist ("Lynard Skynard");
+       schema:duration "PT4M45S";
+       schema:inAlbum "Second Helping";
+       schema:name "Sweet Home Alabama";
+       schema:url "sweet-home-alabama"]
      [ a schema:MusicRecording;
-     schema:byArtist "Bob Seger";
-     schema:duration "PT3M12S";
-     schema:inAlbum "Stranger In Town";
-     schema:name "Old Time Rock and Roll";
-     schema:url "old-time-rock-and-roll"],
+       schema:byArtist ("AC/DC");
+       schema:duration "PT3M32S";
+       schema:inAlbum "Back In Black";
+       schema:name "Shook you all Night Long";
+       schema:url "shook-you-all-night-long"]
      [ a schema:MusicRecording;
-     schema:byArtist "John Cougar";
-     schema:duration "PT3M39S";
-     schema:inAlbum "American Fool";
-     schema:name "Hurt So Good";
-     schema:url "hurt-so-good"]]) .
+       schema:byArtist ("ZZ Top");
+       schema:duration "PT4M13S";
+       schema:inAlbum "Eliminator";
+       schema:name "Sharp Dressed Man";
+       schema:url "sharp-dressed-man"]
+     [ a schema:MusicRecording;
+       schema:byArtist ("Bob Seger");
+       schema:duration "PT3M12S";
+       schema:inAlbum "Stranger In Town";
+       schema:name "Old Time Rock and Roll";
+       schema:url "old-time-rock-and-roll"]
+     [ a schema:MusicRecording;
+       schema:byArtist ("John Cougar");
+       schema:duration "PT3M39S";
+       schema:inAlbum "American Fool";
+       schema:name "Hurt So Good";
+       schema:url "hurt-so-good"])]) .

--- a/microdata-rdf/tests/sdo_eg_md_24.ttl	Mon Sep 03 12:08:44 2012 -0600
+++ b/microdata-rdf/tests/sdo_eg_md_24.ttl	Mon Sep 03 12:09:08 2012 -0600
@@ -4,20 +4,23 @@
 
 <http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_24.html> md:item (
  [ a schema:TVSeries;
-   schema:actor [ a schema:Person;
-     schema:name "Justin Chambers"],
+   schema:actor (
      [ a schema:Person;
-     schema:name "Jessica Capshaw"];
+       schema:name "Justin Chambers"]
+     [ a schema:Person;
+       schema:name "Jessica Capshaw"]);
    schema:name "Greys Anatomy";
-   schema:season [ a schema:TVSeason;
-     schema:datePublished "2005-05-22";
-     schema:name "Season 1";
-     schema:numberofEpisodes "14"],
+   schema:season (
      [ a schema:TVSeason;
-     schema:datePublished "2006-05-14";
-     schema:episode [ a schema:TVEpisode;
-       schema:episodeNumber "1";
-       schema:name "Episode 1"];
-     schema:name "Season 2";
-     schema:numberofEpisodes "27"]] [ a schema:Person;
-   schema:author "Shonda Rimes"]) .
+       schema:datePublished "2005-05-22";
+       schema:name "Season 1";
+       schema:numberofEpisodes "14"]
+     [ a schema:TVSeason;
+       schema:datePublished "2006-05-14";
+       schema:episode (
+         [ a schema:TVEpisode;
+           schema:episodeNumber "1";
+           schema:name "Episode 1"]);
+       schema:name "Season 2";
+       schema:numberofEpisodes "27"])]
+     [ a schema:Person; schema:author "Shonda Rimes"]) .

--- a/microdata-rdf/tests/sdo_eg_md_25.ttl	Mon Sep 03 12:08:44 2012 -0600
+++ b/microdata-rdf/tests/sdo_eg_md_25.ttl	Mon Sep 03 12:09:08 2012 -0600
@@ -4,18 +4,19 @@
 
 <http://www.w3.org/TR/microdata-rdf/tests/sdo_eg_md_25.html> md:item (
  [ a schema:MusicAlbum;
-   schema:byArtist [ a schema:MusicGroup;
-     schema:name "Radiohead"];
+   schema:byArtist (
+     [ a schema:MusicGroup; schema:name "Radiohead"]);
    schema:genre "Alt/Punk";
    schema:image <http://www.w3.org/TR/microdata-rdf/tests/king-of-limbs.jpg>;
    schema:name " King of Limbs ";
    schema:numTracks "8";
-   schema:track [ a schema:MusicRecording;
-     schema:duration "PT5M14S";
-     schema:name "Bloom";
-     schema:url "/artist/radiohead/album/the-king-of-limbs/track/bloom"],
+   schema:track (
      [ a schema:MusicRecording;
-     schema:duration "PT4M40S";
-     schema:name "Morning Mr Magpie";
-     schema:url "/artist/radiohead/album/the-king-of-limbs/track/morning-mr-magpie"];
+       schema:duration "PT5M14S";
+       schema:name "Bloom";
+       schema:url "/artist/radiohead/album/the-king-of-limbs/track/bloom"]
+     [ a schema:MusicRecording;
+       schema:duration "PT4M40S";
+       schema:name "Morning Mr Magpie";
+       schema:url "/artist/radiohead/album/the-king-of-limbs/track/morning-mr-magpie"]);
    schema:url "/artist/radiohead/album/the-king-of-limbs"]) .

--- a/microdata-rdf/tests/test-registry.json	Mon Sep 03 12:08:44 2012 -0600
+++ b/microdata-rdf/tests/test-registry.json	Mon Sep 03 12:09:08 2012 -0600
@@ -36,5 +36,38 @@
       "list": {"multipleValues": "list"},
       "typed": {"datatype": "http://typed"}
     }
+  },
+  "http://schema.org/": {
+    "propertyURI":    "vocabulary",
+    "multipleValues": "unordered",
+    "properties": {
+      "additionalType": {"subPropertyOf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"},
+      "blogPosts": {"multipleValues": "list"},
+      "blogPosts": {"multipleValues": "list"},
+      "breadcrumb": {"multipleValues": "list"},
+      "byArtist": {"multipleValues": "list"},
+      "creator": {"multipleValues": "list"},
+      "episode": {"multipleValues": "list"},
+      "episodes": {"multipleValues": "list"},
+      "event": {"multipleValues": "list"},
+      "events": {"multipleValues": "list"},
+      "founder": {"multipleValues": "list"},
+      "founders": {"multipleValues": "list"},
+      "itemListElement": {"multipleValues": "list"},
+      "musicGroupMember": {"multipleValues": "list"},
+      "performerIn": {"multipleValues": "list"},
+      "actor": {"multipleValues": "list"},
+      "actors": {"multipleValues": "list"},
+      "performer": {"multipleValues": "list"},
+      "performers": {"multipleValues": "list"},
+      "producer": {"multipleValues": "list"},
+      "recipeInstructions": {"multipleValues": "list"},
+      "season": {"multipleValues": "list"},
+      "seasons": {"multipleValues": "list"},
+      "subEvent": {"multipleValues": "list"},
+      "subEvents": {"multipleValues": "list"},
+      "track": {"multipleValues": "list"},
+      "tracks": {"multipleValues": "list"}
+    }
   }
 }