Simplify Metadata class slightly