Revert "Removed MetadataManager inferface, as this made a mess here"

This reverts commit 86cf43ee554709399ddaafa0cdc419f31ab2fe4a.