Changes for Metadata Support
fix-2