Updated metadata to split into entityInfo and schema.  Reworked hooks as well
Updated motivation a bit