Some additions to Metadata Export script