Changes for Metadata Support:
fix-3