metadata tool improvements