Handle more CommonsMetadata fields

please split this line, i have a short attention span ;)