Revert "add meta-data"

This reverts commit de04921831483825de3983c3c7c35307366db6f5.
Revert "Revert "add meta-data""

This reverts commit 6b54b626e8bb23b1e5e70f6bd6a08f3f32fa93ac.