New MetaData classes for cleaner handling of metadata