Revert "Revert "Metadata""

This reverts commit 90d731b2447a8060c39c36fc5318419454c86d86.