Metadat tool improvement