Changes for Metadata:
fix-2