Update #62 big Metadata refactoring.