Added Metadata Fixes