Awaiting review before proceeding attempts for metadata support on other objects.

- Shiva