Picocon 31 Rich metadata
Minor fix