Added metadata types and parsing back in.
Added top-level types and parsers.