Bugfix #7: Metadata/metadata Extension