Changes for Metadata Support