Metadata class updates to code base, all tests running