Improve metadata spec, show the extra detail on graphs