Metadata should be new section