Revert "Remove Metadata Stuff"

This reverts commit 9261ad86e9f946f90adf20ff97a790d39080f690.