Update #35 : refactor Metadata