Further tweaking of metadata