Rework on metadata edit