Changes for Metadata
fix-1